Merge remote-tracking branch 'refs/remotes/joan2937/master'
authorBjoernSch <mail@bjoern-schrader.de>
Wed, 3 Aug 2016 13:59:42 +0000 (15:59 +0200)
committerBjoernSch <mail@bjoern-schrader.de>
Wed, 3 Aug 2016 13:59:42 +0000 (15:59 +0200)
commit5fcd079681f2b53ce160e6d1897990d1136886dd
tree0cb4587323d6bf7cba88fb42196b16fc817a3546
parenta690936253bd232b92cececd677870aade3a725b
parentf9e24d568bab974bd353d8bfa7453de2acd66fa0
Merge remote-tracking branch 'refs/remotes/joan2937/master'